From 920861079472522052bf3169f0fb686fb013e157 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 13 Jun 2011 17:42:40 -0400 Subject: [PATCH] cus-dep fix for build failure first occurring with r104579 The symptom was `make custom-dep' failing with "Unknown terminal type". This is caused by `display-buffer' trying to pop-up a frame in batch mode. I think this cus-dep change may be just papering over the immediate manifestation of the underlying problem. * lisp/cus-dep.el (custom-make-dependencies): Use up command-line-args-left. --- lisp/ChangeLog | 4 ++++ lisp/cus-dep.el | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 129e28e876c..c3f6b9b5d89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-06-13 Glenn Morris + + * cus-dep.el (custom-make-dependencies): Use up command-line-args-left. + 2011-06-13 Martin Rudalics * help.el (help-window): Remove variable. diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index 5e74c68978f..091f832c092 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -42,9 +42,12 @@ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)" (defun custom-make-dependencies () "Batch function to extract custom dependencies from .el files. Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" - (let ((enable-local-eval nil)) + (let ((enable-local-eval nil) + subdir) (with-temp-buffer - (dolist (subdir command-line-args-left) + ;; Use up command-line-args-left else Emacs can try to open + ;; the args as directories after we are done. + (while (setq subdir (pop command-line-args-left)) (message "Directory %s" subdir) (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'")) (default-directory (expand-file-name subdir)) -- 2.30.2